Pimki 1.3.092 → 1.4.092

data/README

@@ -1,13 +1,13 @@
-<pre>
-What is Instiki?
-================
+===What is Instiki?
 
-Admitted, it's Yet Another Wiki Clone[1], but with a strong focus
+Admitted, it's YetAnotherWikiClone[http://c2.com/cgi/wiki?WikiWikiClones], but with a strong focus
 on simplicity of installation and running:
 
 Step 1. Download
-Step 2. Run "instiki.rb"
-Step 3. *Chuckle*... "There's no step three!" (TM)
+
+Step 2. Run "instiki"
+
+Step 3. Chuckle... "There's no step three!" (TM)
 
 You're now running a perfectly suitable wiki on port 2500 
 that'll present you with one-step setup, followed by a textarea for the home page
@@ -18,7 +18,7 @@ using a wiki. It's so simple to get running that you'll find yourself
 using it for anything -- taking notes, brainstorming, organizing a 
 gathering.
 
-Features:
+===Features:
 * Regular expression search: Find deep stuff really fast
 * Revisions: Follow the changes on every page from birth. Rollback to an earlier rev
 * Export to HTML or markup in a zip: Take the entire wiki with you home or for reference
@@ -27,132 +27,146 @@ Features:
 * Password-protected webs: Keep it private
 * Authors: Each revision is associated with an author, so you can see who changed what
 * Reference tracker: Which other pages are pointing to the current?
-* Speed: Using Madelein for persistence (all pages are in memory)
-* Three markup choices: Textile (default / RedCloth), Markdown (BlueCloth), and RDoc
-* Embedded webserver: Through WEBrick
+* Speed: Using Madelein[http://madeleine.sourceforge.net] for persistence (all pages are in memory)
+* Three markup choices: Textile[http://www.textism.com/tools/textile] 
+  (default / RedCloth[http://www.whytheluckystiff.net/ruby/redcloth]), 
+  Markdown (BlueCloth[http://bluecloth.rubyforge.org]), and RDoc[http://rdoc.sourceforge.net/doc]
+* Embedded webserver: Through WEBrick[http://www.webrick.org]
 * Internationalization: Wiki words in any latin, greek, cyrillian, or armenian characters
 * Color diffs: Track changes through revisions
 
-Missing:
+===Missing:
 * File attachments
 
-Command-line options:
-Run "ruby instiki.rb --help"
-
-History:
-* 0.9.2: Changed rollback link to be powered by javascript so it's not trigged by search engines
-         Changed to use inline style on published pages
-         Fixed "forward in time" on the last revision before current page
-* 0.9.1: Added performance improvements for updating existing pages
-         Fixed IP logging and RSS feeds behind proxies [With help from Guan Yang]
-         Fixed default storage directory (borked running on Windows) [Spotted by Curt Hibbs]
-* 0.9.0: Added aliased links such as [[HomePage|that nice home page]] [Mark Reid]
-         Added include other page content with [[!include TableOfContents]] [Mark Reid]
-         Added delete orphan pages from the Edit Web screen [by inspiration from Simon Arnaud]
-         Added logging of IP address for authors (who's behind the rollback wars)
-         Added Categories pages through backlinks (use "categories: news, instiki" on start of line) [Mark Reid]
-         Added option to use bracket-style wiki links only (and hence ban WikiWords)
-         Added command-line option to specify different storage path
-         Added print view without navigation
-         Added character and page (2275 characters including spaces) counter (important for student papers)
-           Off by default, activate it on the Edit Web screen
-         Added LaTeX/PDF integration on Textile installations with pdflatex installed on system (EXPERIMENTAL)
-           Use the home page as a table of contents with a unordered list to control sections
-         Added limit of 15 to the number of pages included in RSS feed
-         Moved static parts of stylesheet to separate file [Lau T�rnskov]
-         Fixed better semantics for revision movement [Ryan Singer]
-         Fixed color diffs to work much better [Xen/Mertz/Atkins]
-         Fixed performance problems for All Pages list [Dennis Mertz]
-         Fixed lots of rendering bugs [Mark Reid]
-         Upgraded to RedCloth 2.0.11 [integrating the fine work of Dennis Mertz]
-* 0.8.9: Added color diffs to see changes between revisions [Bill Atkins]
-            They're aren't quite perfect yet as new paragraphs split the <ins> tags (hence 0.8.9, not 0.9.0)
-         Added redirect to edit if content of page generates an error
-            (so the page doesn't become unusable on bugs in the markup engines)
-         Fixed update Web with different address bug [Denis Metz]
-         Fixed a bunch of wiki word rendering issues by doing wiki word detection and replacment at once
-         Upgraded to BlueCloth 0.0.3b (should fix loads of problems on Markdown wikis)
-* 0.8.5: Instiki can now serve as a CMS by running a password-protected web with a published front
-         Added version check at startup (Instiki needs Ruby 1.8.1)
-* 0.8.1: Actually included RedCloth 2.0.7 in the release
-* 0.8.0: NOTE: Single-web wikis created in versions prior to 0.8.0 have "instiki" as their system password
-         Accepts wiki words in bracket style. Ex: [[wiki word]], [[c]],  [[We could'nt have done it!]]
-         Accepts camel-case wiki words in all latin, greek, cyrillian, and armenian unicode characters
-            Many thanks to Guan Yang for building the higher- and lower-case lookup tables
-            And thanks to Simon Arnaud for the initial patch that got the work started
-         Changed charset to UTF-8
-         Cut down on command-line options and replaced them with an per-web config screen
-         Added option to extend the stylesheet on a per-web basis to tweak the look in details
-         Added simple color options for variety
-         Added option to add/remove password protection on each web
-         Added the wiki name of the author locking a given page (instead of just "someone")
-         Removed single/multi-web distinction -- all Instikis are now multi-web
-         Load libraries from an unshifted load path, so that old installed libraries doesn't clash [Emiel van de Laar]
-         Keeps the author cookie forever, so you don't have to enter your name again and again
-         Fixed XHTML so it validates [Bruce D'Arcus]
-         Authors are no longer listed under orphan pages
-         Added export to markup (great for backups, potentially for switching wiki engine)
-         Don't link wiki words that proceeds from either /, = or ?
-           (http://c2.com/cgi/wiki?WikiWikiClones, /show/HomePage, cgi.pl?show=WikiWord without escaping)
-         Accessing an unexisting page redirects to a different url (/new/PageName)
-         Increased snapshot time to just once a day (cuts down on disk storage requirements)
-         Made RDoc support work better with 1.8.1 [Mauricio Fern�ndez]
-         Added convinient redirect from /wiki/ to /wiki/show/HomePage
-         Fixed BlueCloth bug with backticks at start of line
-         Updated to RedCloth 2.0.7 (and linked to the new Textile reference)
-* 0.7.0: Added Markdown (BlueCloth) and RDoc [Mauricio Fern�ndez] as command-line markup choices
-         Added wanted and orphan page lists to All pages (only show up if there's actually orphan or wanted pages)
-         Added ISO-8859-1 as XML encoding in RSS feeds (makes FeedReader among others happy for special entities)
-         Added proper links in the RSS feed (but the body links are still relative, which NNW and others doesn't grok)
-         Added access keys: E => Edit, H => HomePage, A => All Pages, U => Recently Revised, X => Export
-         Added password-login through URL (so you can subscribe to feed on a protected web)
-         Added web passwords to the feed links for protected webs, so they work without manual login
-         Added the web name in small letters above all pages within a web
-         Polished authors and recently revised 
-         Updated to RedCloth 2.0.6
-         Changed content type for RSS feeds to text/xml (makes Mozilla Aggreg8 happy)
-         Changed searching to be case insensitive
-         Changed HomePage to display the name of the web instead
-         Changed exported HTML pages to be valid XHTML (which can be preprocessed by XSLT)
-         Fixed broken recently revised
-* 0.6.0: Fixed Windows compatibility [Florian]
-         Fixed bug that would prevent Madeleine from taking snapshots in Daemon mode
-         Added export entire web as HTML in a zip file
-         Added RSS feeds
-         Added proper getops support for the growing number of options [Florian]
-         Added safe mode that forbids style options in RedCloth [Florian]
-         Updated RedCloth to 2.0.5
-* 0.5.0: NOTE: 0.5.0 is NOT compatible with databases from earlier versions
-         Added revisions
-         Added multiple webs
-         Added password protection for webs on multi-web setups
-         Added the notion of authors (that are saved in a cookie)
-         Added command-line option for not running as a Daemon on Unix
-* 0.3.1: Added option to escape wiki words with \
-* 0.3.0: Brought all files into common style (including Textile help on the edit page)
-         Added page locking (if someone already is editing a page there's a warning)
-         Added daemon abilities on Unix (keep Instiki running after you close the terminal)
-         Made port 2500 the default port, so Instiki can be launched by dobbelt-click
-         Added Textile cache to speed-up rendering of large pages
-         Made WikiWords look like "Wiki Words"
-         Updated RedCloth to 2.0.4
-* 0.2.5: Upgraded to RedCloth 2.0.2 and Madeleine 0.6.1, which means the
-         Windows problems are gone. Also fixed a problem with wikiwords
-         that used part of other wikiwords.
-* 0.2.0: First public release
-
-Download latest from: 
-<a href="http://rubyforge.org/project/showfiles.php?group_id=186">http://rubyforge.org/project/showfiles.php?group_id=186</a>
-
-Visit the official Instiki wiki:
-http://www.instiki.org/
-
-License is the same as Ruby's
-
-[1] <a href="http://c2.com/cgi/wiki?WikiWikiClones">http://c2.com/cgi/wiki?WikiWikiClones</a>
-[2] Textile Syntax: <a href="http://www.textism.com/tools/textile/">http://www.textism.com/tools/textile/</a>
---
-David Heinemeier Hansson,
-david@loudthinking.com
-http://www.loudthinking.com/
-</pre>
+===Install from gem:
+* Install rubygems
+* Run "gem install instiki"
+* Change to a directory where you want Instiki to keep its data files (for example,  ~/instiki/)
+* Run "instiki" - this will create a "storage" directory (for example, ~/instiki/storage), and start a new Wiki service
+
+Make sure that you always launch Instiki from the same working directory, or specify the storage directory in runtime parameters, such as:
+  instiki --storage ~/instiki/storage
+
+===Command-line options:
+* Run "instiki --help"
+
+===History:
+ * 0.9.2: Rollback takes the user to an edit form. The form has to be submitted for the change to take place.
+          Changed to use inline style on published pages
+          Fixed "forward in time" on the last revision before current page
+          Instiki won't log bogus error messages when creating a new Wiki.
+          Fixed deprecation warning for Object.id (introduced in Ruby 1.8.2)
+          Madeleine upgraded to 0.7.1
+          Madeleine snapshots are compressed
+          Packaged as a gem
+ * 0.9.1: Added performance improvements for updating existing pages
+          Fixed IP logging and RSS feeds behind proxies [With help from Guan Yang]
+          Fixed default storage directory (borked running on Windows) [Spotted by Curt Hibbs]
+ * 0.9.0: Added aliased links such as [[HomePage|that nice home page]] [Mark Reid]
+          Added include other page content with [[!include TableOfContents]] [Mark Reid]
+          Added delete orphan pages from the Edit Web screen [by inspiration from Simon Arnaud]
+          Added logging of IP address for authors (who's behind the rollback wars)
+          Added Categories pages through backlinks (use "categories: news, instiki" on start of line) [Mark Reid]
+          Added option to use bracket-style wiki links only (and hence ban WikiWords)
+          Added command-line option to specify different storage path
+          Added print view without navigation
+          Added character and page (2275 characters including spaces) counter (important for student papers)
+          Off by default, activate it on the Edit Web screen
+          Added LaTeX/PDF integration on Textile installations with pdflatex installed on system (EXPERIMENTAL)
+          Use the home page as a table of contents with a unordered list to control sections
+          Added limit of 15 to the number of pages included in RSS feed
+          Moved static parts of stylesheet to separate file [Lau T�rnskov]
+          Fixed better semantics for revision movement [Ryan Singer]
+          Fixed color diffs to work much better [Xen/Mertz/Atkins]
+          Fixed performance problems for All Pages list [Dennis Mertz]
+          Fixed lots of rendering bugs [Mark Reid]
+          Upgraded to RedCloth 2.0.11 [integrating the fine work of Dennis Mertz]
+ * 0.8.9: Added color diffs to see changes between revisions [Bill Atkins]
+              They're aren't quite perfect yet as new paragraphs split the <ins> tags (hence 0.8.9, not 0.9.0)
+          Added redirect to edit if content of page generates an error
+              (so the page doesn't become unusable on bugs in the markup engines)
+          Fixed update Web with different address bug [Denis Metz]
+          Fixed a bunch of wiki word rendering issues by doing wiki word detection and replacment at once
+          Upgraded to BlueCloth 0.0.3b (should fix loads of problems on Markdown wikis)
+ * 0.8.5: Instiki can now serve as a CMS by running a password-protected web with a published front
+          Added version check at startup (Instiki needs Ruby 1.8.1)
+ * 0.8.1: Actually included RedCloth 2.0.7 in the release
+ * 0.8.0: NOTE: Single-web wikis created in versions prior to 0.8.0 have "instiki" as their system password
+          Accepts wiki words in bracket style. Ex: [[wiki word]], [[c]],  [[We could'nt have done it!]]
+          Accepts camel-case wiki words in all latin, greek, cyrillian, and armenian unicode characters
+             Many thanks to Guan Yang for building the higher- and lower-case lookup tables
+             And thanks to Simon Arnaud for the initial patch that got the work started
+          Changed charset to UTF-8
+          Cut down on command-line options and replaced them with an per-web config screen
+          Added option to extend the stylesheet on a per-web basis to tweak the look in details
+          Added simple color options for variety
+          Added option to add/remove password protection on each web
+          Added the wiki name of the author locking a given page (instead of just "someone")
+          Removed single/multi-web distinction -- all Instikis are now multi-web
+          Load libraries from an unshifted load path, so that old installed libraries doesn't clash [Emiel van de Laar]
+          Keeps the author cookie forever, so you don't have to enter your name again and again
+          Fixed XHTML so it validates [Bruce D'Arcus]
+          Authors are no longer listed under orphan pages
+          Added export to markup (great for backups, potentially for switching wiki engine)
+          Don't link wiki words that proceeds from either /, = or ?
+            (http://c2.com/cgi/wiki?WikiWikiClones, /show/HomePage, cgi.pl?show=WikiWord without escaping)
+          Accessing an unexisting page redirects to a different url (/new/PageName)
+          Increased snapshot time to just once a day (cuts down on disk storage requirements)
+          Made RDoc support work better with 1.8.1 [Mauricio Fern�ndez]
+          Added convinient redirect from /wiki/ to /wiki/show/HomePage
+          Fixed BlueCloth bug with backticks at start of line
+          Updated to RedCloth 2.0.7 (and linked to the new Textile reference)
+ * 0.7.0: Added Markdown (BlueCloth) and RDoc [Mauricio Fern�ndez] as command-line markup choices
+          Added wanted and orphan page lists to All pages (only show up if there's actually orphan or wanted pages)
+          Added ISO-8859-1 as XML encoding in RSS feeds (makes FeedReader among others happy for special entities)
+          Added proper links in the RSS feed (but the body links are still relative, which NNW and others doesn't grok)
+          Added access keys: E => Edit, H => HomePage, A => All Pages, U => Recently Revised, X => Export
+          Added password-login through URL (so you can subscribe to feed on a protected web)
+          Added web passwords to the feed links for protected webs, so they work without manual login
+          Added the web name in small letters above all pages within a web
+          Polished authors and recently revised 
+          Updated to RedCloth 2.0.6
+          Changed content type for RSS feeds to text/xml (makes Mozilla Aggreg8 happy)
+          Changed searching to be case insensitive
+          Changed HomePage to display the name of the web instead
+          Changed exported HTML pages to be valid XHTML (which can be preprocessed by XSLT)
+          Fixed broken recently revised
+ * 0.6.0: Fixed Windows compatibility [Florian]
+          Fixed bug that would prevent Madeleine from taking snapshots in Daemon mode
+          Added export entire web as HTML in a zip file
+          Added RSS feeds
+          Added proper getops support for the growing number of options [Florian]
+          Added safe mode that forbids style options in RedCloth [Florian]
+          Updated RedCloth to 2.0.5
+ * 0.5.0: NOTE: 0.5.0 is NOT compatible with databases from earlier versions
+          Added revisions
+          Added multiple webs
+          Added password protection for webs on multi-web setups
+          Added the notion of authors (that are saved in a cookie)
+          Added command-line option for not running as a Daemon on Unix
+ * 0.3.1: Added option to escape wiki words with \
+ * 0.3.0: Brought all files into common style (including Textile help on the edit page)
+          Added page locking (if someone already is editing a page there's a warning)
+          Added daemon abilities on Unix (keep Instiki running after you close the terminal)
+          Made port 2500 the default port, so Instiki can be launched by dobbelt-click
+          Added Textile cache to speed-up rendering of large pages
+          Made WikiWords look like "Wiki Words"
+          Updated RedCloth to 2.0.4
+ * 0.2.5: Upgraded to RedCloth 2.0.2 and Madeleine 0.6.1, which means the
+          Windows problems are gone. Also fixed a problem with wikiwords
+          that used part of other wikiwords.
+ * 0.2.0: First public release
+
+===Download latest from: 
+* http://rubyforge.org/project/showfiles.php?group_id=186
+
+===Visit the official Instiki wiki:
+* http://www.instiki.org
+
+===License:
+* same as Ruby's
+
+---
+Author:: David Heinemeier Hansson
+Email::  david@loudthinking.com
+Weblog:: http://www.loudthinking.com

data/README-PIMKI

@@ -52,20 +52,30 @@ Pimki added features:
   Moved to bottom of Home Page.
 * Minor stylesheet tweaks.
 
-Missing:
+ToDo:
 
-* Expand todo with more task types?
-* Expand Search
+* Expand todo with @Context
+* Advanced Search
+   * Advanced Search options (not just regexp, case sensitivity etc)
    * Highlight match on individual page when clicked form search results
-   * Advanced Search (not just regexp, case sensitivity)?
 * Editable left-side menu options: by search results? by author?
-* Bliki entries revision diff.
 
 
 Command-line options:
 Run "ruby pimki.rb --help"
 
 History:
+1.4.092 New features release
+    - Added a major/minor edit override for the default 'continous edit' when
+      revising a page.
+    - MarkDown can now be through RedCloth 3.0.0 (experimental) or BlueCloth.
+    - Integrated Instiki release 0.9.2 features and bug fixes.
+    - Todo@Context
+    - Edit page on double click  (based on Mark Reid's patch to Instiki)
+    - Possibility to require edit password for each edit
+    - Persist user changes to free-wiki menu content
+    - Numerous bug fixes.
+
 1.3.092 New features and bug fixes release
     - Updated to RedCloth v3.0.0.
     - Fixed problem with incorrect handling of some complex link formats and

data/app/controllers/wiki.rb

@@ -1,6 +1,8 @@
 require "cgi"
 require "redcloth_for_tex"
 
+RenderedTodo = Struct.new( :text, :context, :due_date )
+
 class WikiController < ActionControllerServlet
   EXPORT_DIRECTORY = WikiService.storage_path unless const_defined?("EXPORT_DIRECTORY")
 
@@ -112,17 +114,22 @@ class WikiController < ActionControllerServlet
     @pages_by_name = @pages_in_category.by_name 
     @page_names_that_are_wanted = @pages_in_category.wanted_pages
     @pages_that_are_orphaned = @pages_in_category.orphaned_pages
-    case @req.query['Action']
-    when 'Delete' # Handle page deletion
-      wiki.delete_page(web_address, @req.query['sel_page_name'])
-      redirect_action "list/"
-    
-    when 'Create' # Handle page creation
-      redirect_show @req.query['newpage']
 
-    when 'Rename' # Handle page rename
-      wiki.rename_page(web_address, @req.query['sel_page_name'], @req.query['newpage'])
-      redirect_action "list/"
+    if @req.query['Action']
+      redirect_action 'list/' if web.check_pass_on_edit and not authenticate
+
+      case @req.query['Action']
+        when 'Delete' # Handle page deletion
+          wiki.delete_page(web_address, @req.query['sel_page_name'])
+          redirect_action "list/"
+        
+        when 'Create' # Handle page creation
+          redirect_show @req.query['newpage']
+    
+        when 'Rename' # Handle page rename
+          wiki.rename_page(web_address, @req.query['sel_page_name'], @req.query['newpage'])
+          redirect_action "list/"
+      end
     end
 
   end
@@ -160,9 +167,16 @@ class WikiController < ActionControllerServlet
     send_export(file_name, file_path)
   end
 
+  def edit_web #{{{
+    parse_category
+    set_mm_options
+  end #}}}
+  
   def update_web
     redirect_show("HomePage") unless wiki.authenticate(@params["system_password"])
 
+    set_mm_options
+
     wiki.update_web(
       web.address, @params["address"], @params["name"], 
       @params["markup"].intern, 
@@ -174,7 +188,10 @@ class WikiController < ActionControllerServlet
       @params["count_pages"] ? true : false,
       @params['mind_map_size'],
       @params['symbols_map'],
-      @params['links_map']
+      @params['links_map'],
+      @params['enable_dclick_edit'],
+      @params['check_pass_on_edit'] == 'each_edit',
+      @prog, @graph_type, @missing, @show_authors, @show_leaves, @selected_categories
     )
 
     redirect_show("HomePage", @params["address"])
@@ -189,29 +206,85 @@ class WikiController < ActionControllerServlet
     end
   end
 
+  FAR_FUTURE = Date.new(4000,1,1).freeze
+  TODO_RE = %r{<todo-tag context='(.*?)' due_date='(.*?)'><span class="todo"><strong>TODO(?:.*)?:</strong> (.*?)</span></todo-tag>}
+  
   def todo #{{{
     parse_category
     set_menu_pages
-    @pages_by_name = @pages_in_category.by_name
-    @todo_items = Hash.new { Array.new }
-    @bliki_todo_items = Hash.new { Array.new }
-    @pages_by_name.each do |page|
-      if page.content =~ Todo.pattern
+    
+    @context    = @params['context']
+    @sort_order = @params['sort_order']
+
+    clear_render_cache # hack to make sure we don't have old-style rendered todos.
+    @todo_items = analyse_rendered_todo_items @pages_in_category.by_name
+    @bliki_todo_items = analyse_rendered_todo_items web.bliki.values
+
+    @context_links = @todo_items.clone.update(@bliki_todo_items).map { |page, items|
+      # 'items' contain the full 'todo' info
+      items.map { |item| item.context }
+    }.flatten.compact.uniq.reject { |c| c.nil? || c.empty? }.map { |context|
+      @context == context ?
+        "[<span class='selected'>#{context}</span>]" :
+        "<a href='?context=#{context}#{"&sort_order=#{@sort_order}" if @sort_order}'>#{context}</a>"
+    }
+
+    @todo_items = sort_and_filter_todo_items @todo_items, @sort_order, @context
+    @bliki_todo_items = sort_and_filter_todo_items @bliki_todo_items, @sort_order, @context
+
+  end #}}}
+  
+  def analyse_rendered_todo_items pages
+    items = Hash.new { Array.new }
+    pages.each do |page|
+      if page.has_todos?
         # Page has todo items. Get the rendered version (marked-up and with links):
+        # I specifically don't use the todo chunkss because I want the fully marked-up
+        # text of the item.
         content = page.revisions.last.display_content
-        @todo_items[page] = content.scan /<span class="todo"><strong>TODO:<\/strong> (.*?)<\/span>/
+        items[page] = content.scan(TODO_RE).map { |match|
+          RenderedTodo.new match[2], (match[0].empty? ? [] : match[0].split(',') ), (Date.parse(match[1]) rescue FAR_FUTURE)
+        }
       end
     end
-    @todo_items = @todo_items.sort_by { |page, items| page.name }
-    web.bliki.each do |pname, entry|
-      if entry.content =~ Todo.pattern
-        # Entry has todo items. Get the rendered version (marked-up and with links):
-        content = entry.revisions.last.display_content
-        @bliki_todo_items[entry] = content.scan /<span class="todo"><strong>TODO:<\/strong> (.*?)<\/span>/
-      end
+    items
+  end
+  
+  def sort_and_filter_todo_items items, sort_order, context
+    case sort_order
+      when 'due_date'
+        result = items.map { |page, todos|
+          # sort the to items themselves
+          [page, todos.sort_by { |i| i.due_date } ] 
+        }.sort_by { |page, todos|
+          # sort the pages by the one with the most urgent todo
+          todos.map{ |i| i.due_date }.min 
+        }
+
+      else # default = sort by page name
+        result = items.sort_by { |page, items| page.name }
+
     end
-    @bliki_todo_items = @bliki_todo_items.sort_by { |entry, items| entry.name }
-  end #}}}
+
+    if context
+      # filter the items to those that are in context
+      result = result.map { |page, items|
+        [ page, items.select { |item| item.context.include? context } ]
+      }.select { |page, items| not items.empty? }
+    end
+    result
+  end
+
+  def get_todo_display_style due_date
+    # default is the muted 'darkred', to prevent to many bright red
+    # items on one page: (See also chunks/todo.rb)
+    (due_date <=> Date.today) > -1 ? "todoFuture" : "todo"
+  end
+
+  def clear_render_cache do_redirect=false
+    web.refresh_revisions
+    redirect_show 'HomePage' if do_redirect
+  end
   
   def set_menu_pages #{{{
     parse_category
@@ -221,7 +294,7 @@ class WikiController < ActionControllerServlet
       when 'recent'   then @all_pages.by_last_visited
       when 'viewed'   then @all_pages.by_most_viewed
       when 'revised'  then @all_pages.by_revision
-      when 'user'     then @menu_content = web.rendered_menu; nil
+      when 'user'     then @menu_content = web.menu_content.revisions.last.display_content; nil
       when 'category' then web.select { |page| page.in_category?(web.menu_category) } 
       when 'linkers'
         web.select { |page|
@@ -250,32 +323,47 @@ class WikiController < ActionControllerServlet
     @authors = web.authors
   end #}}}
   
-require 'pp'
   def mind #{{{
     parse_category
     set_menu_pages
-
-    @prog = @req.query['draw_type'] || 'neato'
-    @graph_type = @req.query['graph_type'] || 'normal'
-    missing = @pages_in_category.wanted_pages if @req.query['missing']
-    show_authors = !@req.query.empty? && @req.query['show_authors'] == 'on'
-    show_leaves = @req.query.empty? || @req.query['show_leaves'] == 'on'
-    
-    # TODO: fix handling of multiple-select for whole application
-    @selected_categories = @req.body.split('&').map { |pair| 
-      pair.split('=') }.select  { |k,v| 
-        k == 'selected_categs' }.map { |k,v| v } if @req.body
-    @selected_categories ||= []
-    @selected_categories = [] if @selected_categories.include? 'all'
+    set_mm_options
 
     @pngFile = @mapFile = nil
     case @graph_type
-      when 'normal'   then @pngFile, @mapFile = web.create_mind_map(@prog, missing,
-                             show_authors, show_leaves, @selected_categories)
-      when 'author'   then @pngFile, @mapFile = web.create_author_graph(@prog,
-                             @selected_categories)
-      when 'category' then @pngFile, @mapFile = web.create_category_graph(@prog,
-                             show_authors, @selected_categories)
+      when 'normal'
+        @pngFile, @mapFile = web.create_mind_map(@prog, @missing,
+                               @show_authors, @show_leaves, @selected_categories)
+
+      when 'author'
+        @pngFile, @mapFile = web.create_author_graph(@prog, @selected_categories)
+
+      when 'category'
+        @pngFile, @mapFile = web.create_category_graph(@prog,
+                               @show_authors, @selected_categories)
+    end
+  end #}}}
+  
+  def set_mm_options #{{{
+    if @req.query.empty?
+      @prog = web.mm_prog
+      @graph_type = web.mm_graph_type
+      @missing = @pages_in_category.wanted_pages if web.mm_show_missing
+      @show_authors = web.mm_show_authors
+      @show_leaves = web.mm_show_leaves
+      @selected_categories = web.mm_selected_categories
+    else
+      @prog = @req.query['draw_type'] || 'neato'
+      @graph_type = @req.query['graph_type'] || 'normal'
+      @missing = @pages_in_category.wanted_pages if @req.query['missing']
+      @show_authors = @req.query['show_authors'] == 'on'
+      @show_leaves = @req.query.empty? || @req.query['show_leaves'] == 'on'
+      
+      # TODO: fix handling of multiple-select for whole application
+      @selected_categories = @req.body.split('&').map { |pair| 
+        pair.split('=') }.select  { |k,v| 
+          k == 'selected_categs' }.map { |k,v| v } if @req.body
+      @selected_categories ||= []
+      @selected_categories = [] if @selected_categories.include? 'all'
     end
   end #}}}
   
@@ -293,17 +381,18 @@ require 'pp'
       type     = @req.query['type']
       content  = @req.query['content']
       category = @req.query['category']
+      author   = @req.query['author']
       
       limit = @req.query['limit'].to_i rescue nil
       limit = 20 unless limit
       limit -= 1 if limit >= 0
       
       # need to go through the WikiService to persist the command:
-      wiki.save_menu_pref web_address, type, limit, content, category
+      wiki.save_menu_pref(web_address, type, limit, content, category, Author.new(author, remote_ip))
     end
 
+    # redirect to the most recently viewed page, or the home page.
     if web_address
-      # redirect to the most recently viewed page, or the home page.
       pname = begin
         web.select{ true }.by_last_visited.first.name
       rescue
@@ -374,6 +463,7 @@ require 'pp'
   end
 
   def new
+    redirect_show("HomePage") if web.check_pass_on_edit and not authenticate
     @page_name, @author = page_name, default_author
   end
 
@@ -396,10 +486,15 @@ require 'pp'
   end
 
   def save
+    if web.check_pass_on_edit and not authenticate
+      wiki.read_page(web_address, page_name).unlock if web.pages[page_name]
+      redirect_show("HomePage")
+    end
+
     if web.pages[page_name]
       page = wiki.revise_page(
         web_address, page_name, @params["content"], Time.now, 
-        Author.new(@params["author"], remote_ip)
+        Author.new(@params["author"], remote_ip), @params['edit_type']
       )
 
       page.unlock
@@ -420,19 +515,24 @@ require 'pp'
   end
 
   def rollback
+    redirect_show("HomePage") if web.check_pass_on_edit and not authenticate
+
     @page = wiki.read_page(web_address, page_name)
-    wiki.rollback_page(web_address, page_name, @params["rev"].to_i, Time.now, remote_ip)
-    redirect_show
+    @revision = @page.revisions[@params["rev"].to_i]  
   end
 
   # Bliki ----------------------------------------------------------------------
   
   def bliki_delete
+    redirect_bliki if web.check_pass_on_edit and not authenticate
+
     wiki.delete_bliki_entry(web_address, page_name)
     redirect_bliki
   end
 
   def bliki_edit
+    redirect_bliki if web.check_pass_on_edit and not authenticate
+
     @page = wiki.read_bliki_entry(web_address, page_name)
 
     if !@page.locked?(Time.now) || @params["break_lock"]
@@ -451,6 +551,8 @@ require 'pp'
   end
 
   def bliki_save
+    redirect_bliki if web.check_pass_on_edit and not authenticate
+
     pname = page_name || @params["pagename"]
     if web.bliki[pname]
       page = wiki.revise_bliki_entry(web_address, pname, @params["content"], Time.now, @params["author"])
@@ -464,11 +566,15 @@ require 'pp'
   end
 
   def bliki_revision
+    parse_category
+    set_menu_pages
     @page = wiki.read_bliki_entry(web_address, page_name || @params['pagename'])
     @revision = @page.revisions[@params["rev"].to_i] || @page.revisions.last
   end
   
   def rollback_bliki
+    redirect_bliki if web.check_pass_on_edit and not authenticate
+  
     @page = wiki.read_bliki_entry(web_address, page_name)
     wiki.rollback_bliki_entry(web_address, page_name, @params["rev"].to_i, Time.now)
     redirect_bliki
@@ -535,7 +641,8 @@ require 'pp'
     end
     
     def authorized?(web_address)
-      (web && web.password.nil?) || 
+      web.nil? ||
+      web.password.nil? || 
       (read_cookie(web_address) && read_cookie(web_address) == web.password) ||
       password_check(@params["password"])
     end
@@ -596,7 +703,13 @@ require 'pp'
     end
     
     def render_markup_help
-      sub_template "#{web.markup}_help"
+      if web
+        markup = web.markup
+        markup = 'markdown' if markup.to_s =~ /markdown/
+        sub_template("#{markup}_help")        
+      else
+        ''
+      end
     end
     
     def send_export(file_name, file_path, content_type = "application/zip")